From 1743e72e8050338d003f529bf01c19730c4ebb5d Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 18 Oct 2006 18:25:06 +0000 Subject: [PATCH] Quote in a CDATA, don't entitize, HTML inside KML. --- kml.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kml.c b/kml.c index 8188886a6..8d47d9f34 100644 --- a/kml.c +++ b/kml.c @@ -634,7 +634,7 @@ static void kml_waypt_pr(const waypoint *waypointp) kml_write_xml(0,"\n"); if (waypointp->url_link_text && waypointp->url_link_text[0]) { char *olink = xml_entitize(waypointp->url_link_text); - kml_write_xml(0,"%s", odesc, olink); + kml_write_xml(0,"%s]]>", odesc, olink); xfree(olink); } else @@ -644,8 +644,11 @@ static void kml_waypt_pr(const waypoint *waypointp) waypointp->gc_data.diff && waypointp->gc_data.terr) { fprintf(ofd, " %3.1f/%3.1f", waypointp->gc_data.diff / 10.0, waypointp->gc_data.terr / 10.0); if (waypointp->gc_data.desc_short.utfstring) { - char *ob = html_entitize(waypointp->gc_data.desc_short.utfstring); - fprintf(ofd, "

%s

\n", ob); + // Dont entitize it - either XML or HTML. + // Wrap it in a cdata and let Earth work it out. + + fprintf(ofd, "%s

]]>\n", waypointp->gc_data.desc_short.utfstring); + xfree(ob); } } -- 2.30.2